From: Joakim Verona <joakim@verona.se>
Date: Fri, 23 Aug 2013 14:42:37 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f909b7cfa7ccac86db11ea8698d01b167a7f37d6;p=emacs.git

merge from trunk
---

f909b7cfa7ccac86db11ea8698d01b167a7f37d6